Merge branch 'fixes'
authorHaavard Skinnemoen <[email protected]>
Thu, 22 Jan 2009 10:11:09 +0000 (11:11 +0100)
committerHaavard Skinnemoen <[email protected]>
Thu, 22 Jan 2009 10:11:09 +0000 (11:11 +0100)

Trivial merge